Merge dca3f6bd3c06abf4e63584760f962e2f9e38834c on remote branch

Change-Id: Ia6fb68fab34d23c28bf25658efc5bc1dae7b62bc
tree: 00058a50cd44fd0b8fb79540dc9a74e43da3ab22
  1. private/
  2. public/
  3. vendor/
  4. Android.mk