Master build error fix (android sdk)