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

Change-Id: If0f0c69fa29a8c1cbd0d5b4e53e386ef8b68757e