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

Change-Id: I4b92941a25b79466d936e459843dee5f27360243