Merge e7d13b373dd55172bbaca0ab2d268263445c0d8e on remote branch

Change-Id: I4bcdf1edb2dc33e4f6b4f97439e2066f1de61d48
tree: 6db2c0ec388b5eb26b5c2fff87eb6fc56c9024d0
  1. policy_hal/
  2. Android.mk