Merge 7d3c95c8ed757647f58c5f27a7db20f6ccfb697d on remote branch

Change-Id: Icfad70143d31cf66926bdacd79746d376c9e5ccb
tree: 2a26501d1eeaf96f73675d8554820b4af27b212f
  1. configs/
  2. policy_hal/
  3. Android.mk