Merge "Fix import of android-support-annotations"