RC: Toggle rewrite (2/2)

PS2: Rebase

Change-Id: Idb9c658ae8a9682812c60f94088e5209bb120d61
support Koush's Superuser

declare the permission android.permission.ACCESS_SUPERUSER

Change-Id: I8c3d2b6a8b6208378aff454a7a0e8b32a55efe8e
Merge "support Koush's Superuser" into jb-mr1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1