skyrocket: update for AOSPA

Change-Id: I35d33b42b2d56b802543f8b6fed9513dfd69e793