Merge "Fix debug statements and aapt assert."