am c7c269f2: Merge "Fix ART debug build boot."

* commit 'c7c269f281b9b9527121251d7081879c790a9b9b':
  Fix ART debug build boot.