Fixbuild and fix aapt warning