Merge 53c1420242e05eb9f3566648cafd035cdbada532 on remote branch

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