Update makefiles for c++-sources and c++-headers.

Test: pass
Bug: 38174080
Change-Id: I34f565da0470b9852c241034ae1a1d522d25cc8d
3 files changed