Update makefiles for c++-sources and c++-headers.
am: 8716f3063e  -s ours

Change-Id: If3655769859781369e8cb8456f133e0c35636254