am 8768c6b7: Merge "Remove phone from frameworks/base subdirs"

* commit '8768c6b70b4b2957a5dda132650e8d6dec7c485e':
  Remove phone from frameworks/base subdirs