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