bacon: get rid of squisher

Change-Id: I3cece868e56f85bfa0b31a62a51e6eab2070ab06
roomservice: Fix wrong assumption about path of active manifest

Change-Id: Id740ff4b848e6ccbfd658be4846197b8ca519237
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge "bacon: get rid of squisher" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1