Merge "Fix mac build." into rvc-dev am: 310b46c1ca

Change-Id: Iec6a046c5f66c6fc7d7bba196be2ae9523536ddc