Update makefiles for c++-sources and c++-headers.
am: 7dcb6dbebc

Change-Id: I975251cf27f58173d8ea87446aeb773476382622