Merge "Add error checking to aapt for split generation" into lmp-mr1-dev
automerge: 69ecfa9

* commit '69ecfa903492b502b7b1636345e050b57313c251':
  Add error checking to aapt for split generation