Merge "Update for support library prebuilt drop"