Update makefiles for c++-sources and c++-headers. am: cb360c60d8 am: 4bd4e7fb3b am: 127b116fe5
am: 8e89a43590

Change-Id: I35950a57e220cdbe7672d5e814230fb73c154fac