fixes the C++ related compilation issues. CRs-Fixed: 2038080 Change-Id: If6b4f379eb27f3de6153b8666f733c0b8245851f Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>