Merge "Remove unused system_modules" am: 93318a40ee am: 36c0262bca am: 3a1d7a5fcd

Change-Id: Iaec03e30215fcdb8a50a2d117e93593f0ed228e7