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

Change-Id: I5b3fb2b2a263d05446cc366018a19345f7e08390