changed build target to 21, updates for lollipop