am 9e0fcdb4: am 1d8f4ad5: Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files."

* commit '9e0fcdb41238363d78b7fd9bef4124f84a9a4590':
  Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files."