fixes for omnirom

Change-Id: Ibbb943776ab9182027720cb49bc5a619adeaf8b2