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

Change-Id: I180e8ed9ec864cac4454bb6c7d4870a8ae066f89