Merge "Add '-unstable' to solve ODR violation" into rvc-dev-plus-aosp