Merge 01cc04f1a835ef18d13baee55e2986fa55dfd6b7 on remote branch

Change-Id: I6d734b66056fc449b1fcc8ad860d658cf9d8cb45
tree: 8ef7e16699f4e9ccdcc1c31f96800c21a79b3611
  1. policy_hal/
  2. Android.mk