Merge "DO NOT MERGE: Drop prebuilt files to android source tree. am: 1139e4db60 am: 1eee44cd6f am: db384a87a1" into udc-qpr-dev-plus-aosp