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

Change-Id: I4b165d32d5fb3f55fe6224a7c629efd0b96f2bbe