[automerger skipped] Merge "Specify LOCAL_USE_EMBEDDED_NATIVE_LIBS for tests that set extractNativeLibs="true"" am: 45abf72de9 am: 12b7d28cef
am: 56309e861e -s ours
am skip reason: change_id Ib0ae79086eadcd21f6e7bfc0d0e61cafb3d25d69 with SHA1 200d4f4222 is in history

Change-Id: Ib068168bb8c02789a170abc0c2509fc2882f37d5