Merge "Revert "Mark libmetricslogger vendor_available."" am: 420eabe3b3 am: bd9bec463f
am: 4dae73a2c6

Change-Id: Iebdce7328e3562554a676153d9e805f81031ecc5