Merge "DO NOT MERGE Drop prebuilt files to android source tree. am: d3a0806d am: 309042b0" into tm-d1-dev-plus-aosp
mentioned in commit b3d1870d
mentioned in commit 3e895520