Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev