Merge "SDK/ant: pass --ignore-assets flag to AAPT."