Merge changes Ibdc76bc0,I98738c66
am: 2ed826a69f

* commit '2ed826a69fa3499d6b7b11ee42088ce2ec25793c':
  logd: liblog: whitelist "snet_event_log"
  liblog: add __android_log_is_loggable checking to writer