Merge fcc3741395085d460fd4b1d351c71630fa2cca35 on remote branch

Change-Id: I2f62eae6e9fa0d5019725777dcdbddbfa0ab96b3
tree: a6ea69230443b98ec6d092a200d113f79780beef
  1. configs/
  2. policy_hal/
  3. Android.mk