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

Change-Id: I7e0b367a94e6bfe3cb08cf674a3d6847780be961