Merge "Add missing #include for ALOGx() macros"