Merge "Remove core-simple from the boot classpath"
am: f66980d6df

Change-Id: I6f07293239c5eaf65252d4f251bf1ef979733802