Merge "Merge "Uncompress native libs only if they are compressed." into nyc-dev am: 451b72438e am: 59fcd79e29" into nyc-mr1-dev-plus-aosp
am: 550fc85425

* commit '550fc8542540b304a00c20c538deafe6cad962e5':

Change-Id: I07e97942118916e53e61d9652a0215affcc1341f