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

Change-Id: Ib757cfab45c52f493e4a04e0a5d3363623836498