Merge "Search for RRO both in SKU subdir and in vendor/overlay" into cw-f-dev am: ffacd81c23
am: b38b015b7c

Change-Id: Ib9e3fb1bc9d152bfc62f004cb09cd5433302163e