Merge "Use default -std values exported from soong"
am: dcd73b5043

Change-Id: I8acd6525a3b07bcc83800b38517e9368c111f8fc