Merge "Drop prebuilt files to android source tree." into rvc-dev am: a04008425f am: 3233e504f3 am: b2c5cd2933
Change-Id: I3074f5636ff5e8f08c1be65154c488dee0f5805c
This commit is contained in: