migrating to Android L and adding appcompat 21