Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev