Manually Revert "J-Team: platform_frameworks_base"