bacon: clean up

Change-Id: Idd411c5a2edd19071f6574a07eba2c2defd95b64
Merge "bacon: clean up" into kitkat