merge from open-source master
tree: 1dd0bd1c28bba839788323032c9b5f1aab78c5d9
  1. mid/
  2. phone/
  3. PolicyConfig.mk