Android 7.0.0 release 27
DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev

Change-Id: I854eddda678934d0da083d22b99b855ed57fd644
1 file changed