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

Change-Id: If864d2b3cd0467b86b8b1a28152faf213276b3fb