Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb