Fixed Android files with Luke's commit