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

Change-Id: I5680995146d27b65acb3ae7ac35bfcc46a379982