Update makefiles for c++-sources and c++-headers.
am: 5aa6f9efb0  -s ours

Change-Id: If9549809107c7f9bef63e01391487dc3dc00b99b