Android m preview 2
Merge "updater: Switch to C++ and fix the build."