Merge "Respect extractNativeLibs in natively bridged environments" am: 61b9b6c9eb
am: a00f278956

Change-Id: Ia790b6fed75624cec36577cfc68d12e5a029d500