Rename SimplePatternFormatterTest to SimpleFormatterTest am: 57b76b470f
am: 4fab653df1  -s ours

Change-Id: I4f59d9b735fa1ec85be6b4f304efca9dede691bb