Merge 53c1420242e05eb9f3566648cafd035cdbada532 on remote branch

Change-Id: I6b6ea49ee3c682671a3464a64590c36bdaef727a
tree: 38cb599bfb368caf527a717ea059650425db4824
  1. etc/
  2. hal/
  3. vendor_product.mk