Android O IOT Preview 5 (OIR1.170720.015)
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"