Merge 1ceb1957aebc8dd4506ac41b980ea6f4c7763478 on remote branch

Change-Id: I4adc510b3fe78af18f97793f735fdd2073e9a59a
tree: d907ac6967ee77664d681a5d0351f93ebd714eac
  1. configs/
  2. policy_hal/
  3. Android.mk