serrano-common: more overlay clean up

Change-Id: I78c82ff3b99a5bf9ed38becbb386e6af637849e4