Updated android project, now builds correctly, with exception of common library