This reverts commit cb9feca3. Bug: 72076216 Test: m javac-check RUN_ERROR_PRONE=true Change-Id: If46e7deba328ee81479739e5a2a1dc0b6d7bf896