am 2759810f: am 7dd72618: Work around relocated boot.oat corruption

* commit '2759810fc4dab86c52f23c8603e5c7479182ae21':
  Work around relocated boot.oat corruption