Use better aapt choices where possible

Change-Id: I58c77fe41744a30fba0a3172cd9b31451814c468
Hide the battery icon out of the statusbar