GitLab

AI 146824: am: CL 146738 am: CL 146687 The maps and gtalkservice libraries were still being included in
  all of the builds.  Fix that.
  We really need to get this generic_with_google product out of
  build/target and into vendor/google, but that can come later.
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146824