Revert "Merge tag 'v3.0.1-javalite'" am: 61f5732738
am: 8b458c474f

Change-Id: I4b06655eee88b2d4e9d5f8ce1743d693d83858d2