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

Change-Id: I4256831e69c3a61ce18a22afcec0cec845da2e93