Merge "Add prebuilt modules for static libs used with NDK STLs" am: 90ec4adf8b
am: b06294a319

Change-Id: I97b147aff97d72abab457fb10b72fd134ec6ac87