Android N IOT Preview 2 (NIG40)
Merge "Fix google-explicit-constructor warnings in bsdiff"