Update makefiles for c++-sources and c++-headers. am: cb360c60d8
am: 4bd4e7fb3b

Change-Id: Ief274574dda12a38f62f49953a88f612d5b3586c