Merge "Make liblog headers compile stand-alone."