switched more packages to AOSP to *hopeully* fix compiler errors

Change-Id: I5157343a4d557d6241ea7ea7457513c1aab0184b