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

Change-Id: I0fe127ee54ba49626b433000e31fceb3a6a1f52a