Updated to compile for android 21