Merge 153d450a1a52db9da3ac0454032b3993c80d1723 on remote branch

Change-Id: If2884637706417bf2029fe81806af0fa934f5f02
tree: 7d20b726ace02d33fa1a70af2b9a36ed198a5ee3
  1. configs/
  2. policy_hal/
  3. Android.mk