am 049d1964: am 8513b62f: Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev

* commit '049d1964dc3b0fab51b0f8e3debf6e1cc83c97f9':
  Include FusedLocation.apk on sdk builds too