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

Change-Id: I7b6516455a680dce06d41764299ea9de205694c8