This follows a change in dex2oat. (cherry picked from commit 741a6ff2) Bug: 21924613 Change-Id: I6b2df1668fdd09d82cfe86e6e51360b954b6c8a9