Revert: frameworks_base switched back to original sources