Deprecate _bp suffix in libmojo am: b419a179fc am: 0ced94a956
am: 6b52a324d0

Change-Id: Ic59bfa64df080d37f22b635e65f8602be4faab50