Remove references to proprietary modules

Bug: 6611375
Change-Id: Iac3e51750edf23636f402118364768480b06a6f4
1 file changed