Added updated Android files from master