Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" am: c437e14c17
am: 5bd7b32c15

Change-Id: I0958fea7b320025bb329defe2d26a922e7f236bb