Merge "DO NOT MERGE Drop prebuilt files to android source tree. am: 9ce51cb3 am: 96c2a83f" into tm-d1-dev-plus-aosp
mentioned in commit 7473d28a
mentioned in commit 0e37b816