Merge "Treat .cxx files as c++"
am: 35bb770e0e

Change-Id: I18b67e43e531aa989bd1f5312808c98bc619063a