Merge "Add prefix in prebuilt_apis"
am: d1bc48a838

Change-Id: Iaa0729a432ffd224e9ddbd3e72cb15566bdf55b1