fixes for libchrome r395517

Change-Id: I0b439cd79fcf166a495c7fb0142e11e342dca52c
3 files changed