Merge "Soong package structure refactoring" into rvc-dev