Merge "Remove Android patch: Add extra method to allow null prefix/suffix in DecimalFormat"