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