Merge "Buffer overrun in __android_log_is_loggable() fix"
am: 35fc00124b

Change-Id: I07d351ef9a787782b303e7b5646f5ded55e093d3