Merge 924b2a21c35e6ce3ffedfd009af23f417c38194f on remote branch

Change-Id: I3f0f34769a7ada14d6dc6397fa94ea28baf750e6
tree: 7852a07860f6a099d6fef2ef8c5495f6e834e15d
  1. policy_hal/
  2. Android.mk