Merge "Rename mainline_system(.*).mk to generic_system(.*).mk"