Merge 23f412b7cd6847d9b6dde8267c2f335ce1dd7188 on remote branch

Change-Id: Ic8167cdf707e8c936a15a880bbfb643d7efc46d6
tree: 0c511790b770449bde515a2a82434da4fe476f61
  1. configs/
  2. policy_hal/
  3. Android.mk