updates
Merge branch 'jb-mr2' of github.com:cmbroms/android_frameworks_native into jb-mr2
Revert "inverted_ui"

This reverts commit d661e262ddbb7e764889867c87e59bddebe7678a.