Update for JB 4.3 and fix aapt warnings