Merge 4c657bfbd20f7038c767615313f8e4c23e09058a on remote branch

Change-Id: I822b8000c9c0f8af506549b200229ffa59cf761e
tree: 490e237203189be9f54c57067dfe0c8851063be1
  1. policy_hal/
  2. Android.mk