Squashed 'ninepatch/' changes from 8af6a69..6ebbbe6

6ebbbe6 Merge commit 'f5b73a99890ecf5a001e908896c5a0cc6ec94dd9'
f5b73a9 oops
3992b16 Merge commit '71cc59b1a9a5433826d47f9f033039c94b51e6fc'
71cc59b Squashed 'ninepatch/' changes from 2a418ef..8af6a69

git-subtree-dir: ninepatch
git-subtree-split: 6ebbbe6cf991ee32d9841fcb6ea6c05adfe0e2be
Merge commit '17294fbb08364e6e4368ffb6d9165c8d65e55d12'