Android O IOT Preview 6 (4475743)
Merge "Scrypt: remove unused include"
am: 9737bb84c9

Change-Id: I04781fd8cdb53a53c136df735f0811cb3cea3096