Merge "Fix libplatformproto includes/export includes"