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

Change-Id: I52810f4fc94086fd23b00bd381c82c71ee5fbfd7