am a567cf55: am 5cb02008: (-s ours) am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev

* commit 'a567cf551d51624c25e9d2fdbd34974d2e8761f1':