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

Change-Id: I76d65d71b7dc089669c23b21ad9fa8b49b0473e0