Revert "Revert "move to hacked frameworks_base and frameworks_native""

This reverts commit ea11e420432d179b7225ce20b4bd5af0660aff54.