Merge "Update for support library prebuilt drop" into pi-dev