Merge f5c32e955e03d8bf5be322d527d66706cb720b0d on remote branch

Change-Id: I199104865b4ae7ea30f02b8a713ddb594d411cca
tree: 0f56581e35c150248089d7246411e623d9fc92d8
  1. policy_hal/
  2. Android.mk