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

Change-Id: I0f691281d86562c96ed0768efb69d6df77d29456