Merge 0b5bf63cec484feba08b773184bc4069bc184633 on remote branch

Change-Id: I8e59ac1c9f946f7600583ac29dffcccfd17b9fb7
tree: 56f6863af0361c863530440eb997b67788c3be80
  1. policy_hal/
  2. Android.mk