Merge 451014cd94b6b5e859bfbf70d2b35275780d1bd2 on remote branch

Change-Id: Ic3334fa3df31809610c3af8235d6ee23a215e3b7
tree: d5066690bac6cc0425d9d914105608ce10835061
  1. policy_hal/
  2. Android.mk