Merge 138cda630ab2628440457fc68accdf3941f6fa50 on remote branch

Change-Id: Ieceef1fadf62f4312fa835758b96f338d656cae9
tree: aca08048aae4e15551be857e3f32f3939f1378ee
  1. etc/
  2. hal/
  3. vendor_product.mk