Merge "ART: Fix LOG_FATAL" am: 1330e553cc am: 4a4636369a
am: 30721b3a02

Change-Id: I094fa848eb623b60d3343415781636cd5bf31300