Remove misc unneeded modifications in libchrome. am: 31babce11b
am: db381cdb15

Change-Id: I782170c546776fad0ca8aa06eaf74045a03f3871