Merge "Replace libmetricslogger logging with up-call to Java for hidden api"
am: 1da230b7f0

Change-Id: Ie58ee2ef4b9973a00f2a5c1af5de0c1a54b4fabb