Merge "Add c_std and cpp_std properties." am: 220ca4d04b am: 66496c4b96
am: 492a5ff3eb

Change-Id: I996cd253525cd5a70ba56432ae1d299abce7f2a4