otterx: Switch to LP branches

Change-Id: I709cb9f04dc41c0ccb45328273f294228b6d9b7d