omni: Fix up aconfig pick up behavior

Change-Id: I809f2eb7232c1e3755a50467341bdb50a6ec3c7f
4 files changed