android: Import required files for third-party-review am: 1277061b73
am: ba1fc72199

Change-Id: Ifc126c9b09b348f21e2c6c699570240962d6906e