Merge "Use #pragma one for all liblog includes"