Merge 95262d0c9a8d018c8122e7ba3a962c1a9b5cacb1 on remote branch

Change-Id: Iedd1fbaebadbfe95111e74dbf48adae1991771c0
tree: cadd3c18948da6d07b78bdbd12a00be21abe0862
  1. configs/
  2. policy_hal/
  3. Android.mk