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

Change-Id: I73f085295b8dbf11ae22562a68e3821a97263a02