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

Change-Id: I9337dd2e4686519c9e955ccf685073ef4640ff85