Merge branch 'stable-2.15' * stable-2.15: Harmonize external dependency names Change-Id: I16df3dd753cdbeeab94d9e86392bc668dc7f1832