overlay: frameworks_base: Clean up and update