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

Change-Id: Icdc0495fce3c2b7caf8e3b7de08676ae3ea081c6