Merge "Merge "Uncompress native libs only if they are compressed." into...
Merge "Merge "Uncompress native libs only if they are compressed." into nyc-dev am: 451b7243 am: 59fcd79e" into nyc-mr1-dev-plus-aosp
am: 550fc854
* commit '550fc854':
Change-Id: I07e97942118916e53e61d9652a0215affcc1341f