Merge "Back-port NDK STLport template fix."