Merge "Fix typo in build_rro_package.mk" into oc-dev am: 7442f7bdaa
am: 6ba42f8684

Change-Id: I321e409c139c0cabbb31d5828b5782054d7478b0