Merge "Put boot class loader classes and strings in dex cache of app images." into nyc-dev