Merge "Add missing #include for ALOGx() macros"
am: 5f35d9993f

Change-Id: I8ec9671fefb9d9dd8ab66911af8d9468d133a929