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

Change-Id: I848ac7e4ee783845d96c2dbf057f759cebf2dae2