[PATCH 1/2] Target SDK 21 (Lollipop)