Merge "Add error checking to aapt for split generation" into lmp-mr1-dev