Merge "Treat aapt parse failures as BuildErrors."