Merge "Use sizeof(android_log_header_t) instead of sizeof its components" am: 8facba4326
am: 7b1e0eee95

Change-Id: I3839fe3d554c1599587e73d12e43a085a6712e2c