* commit 'a547c4516c1a2dfd87f3466fccffd5ca6c5cab8c': Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage"
* commit 'a547c4516c1a2dfd87f3466fccffd5ca6c5cab8c': Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage"