update aapt config
Update cm.mk
Merge remote-tracking branch 'upstream/master'
Change to CM11... hopefully