bacon: Fix overlays

Change-Id: Ia38265a09330b34abf833c48447732706139c909
bacon: Remove oppo/common

Change-Id: I7793135c19345840d62c417940381807d87e4b97