Merge "qssi: remove mainline_system.mk"