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

Change-Id: I008f73bd2a2775453c2f1f5c35903d90fd9d2241