Merge ff8944e692612ab91d5f3fcc8173be4269c5ecf7 on remote branch

Change-Id: If0ce590006fbe7a7bcb70290d38feb06b701a297
tree: 7038d49f39ddd6e9c74a495ef14a3823685bb0c1
  1. policy_hal/
  2. Android.mk