Revert "Use standard location components."

This reverts commit f54f2e717ed01fc2e303824e4a37cc831a5dde13.
Blobs have been updated for lollipop.