Added support for API level 21 (android 5.0), built tools 21.0.0, and SDK 23.0.5