Merged in FusedLocation package from jb-mr1.1 branch of aosp