Android o preview 4
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"