Update to build with latest version of sdk (android-21)