Merge "Revert "Unbundle libstlport with NDK r4.""