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

Change-Id: I5ed0c7a2140282a0c3f3fd7cbc423ec32f79ee76