tenderloin-common:  update for lollipop

Change-Id: I704fd78f988dfd906a7f5a0fe4f3518e0dffb94c