Simplify and cleanup the mobile host rewrites

Change-Id: Iab9633b265fa0f7a7f05080ed46c217bedd75bd8