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

Change-Id: Ica0793d4040393cbf9337f29b5cadb8d7af4ac91