Update project.properties to target android-21 as the AppCompat library uses resources available in API level 21 and upwards.
Merge branch 'vendor'