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

This reverts commit 502e5a4519297d63a1269af98c9dffa28165f820, reversing
changes made to 222a8033eae9446e1b27a480e8d9e50e93b06208.