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

Change-Id: Id2566418174312787958027ac823766da75636c1