Merge "Change com.android.runtime.host to be an installable test_apex" am: c02102cc78
am: 2284b099f4

Change-Id: I668403fcc441f99b7fc74450a120b010d0315ca1