am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev

* commit '7658f0edefab392b2af13b6558d08385c9b3ed5a':
  Teach bmgr that "android" is a valid package name