[androidbp] address comments aosp/149217

Change-Id: I8b4bbbeef6c2c11080a4bc30820b2200ba78b7e9
1 file changed