Merge "Update for support library prebuilt drop" into pi-dev am: 72f57a7c99
am: 77122cf150

Change-Id: I0ba9f459736e597e08dddaa72aff86598082937d