Merge "Native API Council asked that we remove the C++ class from the public...
Merge "Native API Council asked that we remove the C++ class from the public header." into rvc-dev am: 14f33ae8 am: 925972eb
Change-Id: I939e7aaf9592ecb10de57883db47cb6550f5c26d