Merge "Specify LOCAL_USE_EMBEDDED_NATIVE_LIBS for tests that set extractNativeLibs="true"" am: 45abf72de9
am: 12b7d28cef

Change-Id: I4fe282c20f9ff4ce0a0e7248978e471ee0e4d7a9