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

Change-Id: I7836033432b0dbc1d3cc7aa5a7adb46a296e9c05