Merge "Remove support for android.support from update_prebuilts.py" into rvc-dev-plus-aosp