Make bionic upstream stuff compatible with our device boardconfigs

Change-Id: I1e132c95c9366e358ab4ce95469aa8b72343dde2