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