Merge "Bump targetSdkVersion to 24 am: 005586aead am: 8ba482f28b" into nyc-mr1-dev-plus-aosp
am: 996f8a3905

* commit '996f8a390537d806b0cc8208f2379162915efc28':

Change-Id: Ic8d28cfcd6420cb05b4e4c2d284dd62313bc45e6