Merge "Remove core-simple and other unnecessary things"
am: 7ef1a48c0e

Change-Id: Ieb970dd1e413b0a8d9b8acf5e30eaf59ea79b151