Android l-preview release 2
Merge "Use the build system's STL selection."