Merge "Update previous_api for droidstubs and java_api_library" into main