Merge changes I6e98fc65,Ia8665e7c
am: 5ce149b76a

* commit '5ce149b76a44853ec8649057bfcc67d73d3a5a86':
  Remove bootclasspath handling for Jack
  Remove static libraries from Jack classpath

Change-Id: I2839f7a87c2dc4792c67851d38684ebd28313777