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

Change-Id: Iaafbaaab91b0dfe3252b288010345723162cef1a