Merge "Pass phpcs-strict on includes/resourceloader/"