Revert "Merge branch 'master' of https://android.googlesource.com/platform/frameworks/base into jb-ras-mr2.0"

This reverts commit 7f8bb965e7b8d8a4513117efc8b36d3cd69b1ce5, reversing
changes made to 9939ac56eb6a21b3bee995928216d3fd7d5a76a9.