Merge "Use #pragma one for all liblog includes"
am: 07c41cd7ec

Change-Id: I4b92941a25b79466d936e459843dee5f27360243