Merge e2a2493c6a2bd9dc07c4114e0b6aa56a23bdb8bc on remote branch

Change-Id: Idd3030dcc80aac5dbd60254c02974fea35c7e5e7
tree: b757a4689f6193272835711a9b907c94a0e6ead7
  1. policy_hal/
  2. Android.mk