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

Change-Id: I08dccc4ce797784dfbc64346e1985900dc061e38