Merge d41b24502625fc34d1d879e7420cb9a9521a2660 on remote branch

Change-Id: Icaf7830385b5747a435878f4ebb0b91566a78441
tree: 5816531d5297f169711e5449a3d8ccf6eefb2ae4
  1. configs/
  2. policy_hal/
  3. Android.mk