Merge "Rename mainline_system(.*).mk to generic_system(.*).mk" am: 9d39cf5354 am: a29eff4f35

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1413612

Change-Id: I3997579dc3fd90832b1c009dabe6aeaea1e19108