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

Change-Id: I86ff62c1d850a4ce248028d85501b81e615d2bb5