API level 21; security fixes