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

Change-Id: I5b867caa24d5e0bc8bd70bf9ee2c1d6989c5f8ee