clean code
Merge branch 'jellybean' of https://github.com/Quarx2k/android_external_bootmenu into jellybean