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

Test: pass
Bug: 38174080
Change-Id: Id4bfe19b18c3b0c08ec83288aeb7a542230b3ba5
5 files changed