Merge "Adjust installd with new dexopt return values." am: b29c82b67e
am: f118868549

Change-Id: I663a65ac5070782052a2a8676bc1df14074a49bb