* Add fix from Scott/Keith for creating a forward declaration of the needed proprietary parts. Change-Id: Ic958cd94b926048f4c9161884b61273bd4d93503
* Add fix from Scott/Keith for creating a forward declaration of the needed proprietary parts. Change-Id: Ic958cd94b926048f4c9161884b61273bd4d93503