Merge "Remove unused system_modules"
am: 93318a40ee

Change-Id: I421982f57a633c7d48413f31085b1d432215bae3