Update makefiles for c++-sources and c++-headers. (2/2)

Test: pass
Bug: 38174080
Change-Id: Icad451f9f9ad5f46412356a4171a8a1222f8e545
40 files changed