Merge "Update makefiles for c++-sources and c++-headers." am: 0609259ec7
am: 4d32c392d0

Change-Id: I329593a8385ff1a36920feec00c38c8cff8b3de1