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

* commit '30a0031e4388a54890071e7c386b20c81509f27f':
  Remove phone from frameworks/base subdirs