Merge bc17404cc74b507211d06c01abe61d83fc230b9d on remote branch

Change-Id: Ibae908a99e9fa74a12af40df30316755c89ca6f2
tree: d16cd1fe0edd79047e4cb6200a4271986c97ad8f
  1. policy_hal/
  2. Android.mk