Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs