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

Change-Id: I8ae1eb0f010ac600f6d7e11fa7e782e19ec33626