Revert "move to hacked frameworks_base and frameworks_native"

This reverts commit dc3b1f3e5e5ac808d81f0e0fa62111b815345130.