Merge "Add core-simple to the standard boot classpath"
am: 31151ca63c

Change-Id: I5b057dd5091416a22b745bf202745c96d349724a