Rely on the platform -std default. am: 063863bbda
am: a6597185de

Change-Id: If2cb7b00c192a5d034aa23ccc784ed0af3141bf7