Merge "Add prefix in prebuilt_apis" am: d1bc48a838
am: 59255a0ab3

Change-Id: I35cabf23149ea21e5b3231df0bd7fc1f1c12cf0a