Merge "Fix transitive includes" into rvc-dev-plus-aosp