Update android commands to work when a new minor version is released
Merge commit '19736277942b5be185141ca3d48b52d18722e7c6'