Merge a5956c72a350ca32cd376f3fe4ac30df604b6bdf on remote branch

Change-Id: I30483655ca06c223c0dbac819921bac53e440422
tree: a02c993534a1b6dd183e0961121261877ba97f19
  1. configs/
  2. policy_hal/
  3. Android.mk