Merge "platform: gcc 5.3 fix"