Merge "Include manifest_XYZ.xml as part of prebuilts/clang/." am: 80e389397c am: 4dd58ec7c0 am: 91ebe8e455
am: 1882621469

Change-Id: Id8fdc4143f1dea43233eae748ed050ac435dc16f