Merge "Fix typo in build_rro_package.mk" into oc-dev