Merge "Revert "liblog: remove mistakenly added symbols from vndk""