Merge "Bump targetSdkVersion to 24 am: f1210c127a am: 4e106215ed" into nyc-mr1-dev-plus-aosp
am: 6b96f314a3

* commit '6b96f314a39f7e7179259848d748ffd6ae05fe6b':

Change-Id: Ic08744dccb5c2dc70ed92c1b9a42674f90f4dea3