Merge "Add junit-host and make junit an alias for it" am: 5cf160ee9a
am: 918ee8c0a0

Change-Id: I94a3490fe920c615ae2a19304fdb4090714400a9