Merge "Define PRODUCT_SYSTEM_* props for mainline_system"
am: de5b0d2a73

Change-Id: Idd77cedb37c74801cdcd1744d06cfb72271a4303