Merge "Switch to use framework/junit-host.jar"
am: c12eb57602

Change-Id: I53687124aa1c16d7cdd0590d637799ed97713621