Merge "Support library 24.2.0 API diff" into nyc-dev am: 9d25bf73a4
am: 75136ac15b

Change-Id: I83b88e8b9c2b5f807f06b016110a19d46dbb348c