Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am: 3023906b1b
am: 49e0cad3e1

Change-Id: I16775763cb63e18d35765b807acb91fc57286b85