Merge "Remove unused klog_get_level." am: acdb06de6b
am: 5ecc8d2439

Change-Id: Ibd19ac45e18bf0e9a4c5064c20d7bf429d7d9c5c