Use my framework forks

Change-Id: I9dc53b60ebff78b2708ef5c7a8af90f4dc6f2f5c