Merge "Use #pragma one for all liblog includes" am: 4f8246122f am: 548d22107c
am: 5b12fc91a7

Change-Id: I452e241290e04b338cbaefa335ecc652b8a4c849