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

Change-Id: I1174d7e2c630073a9c979172cfc0c4a21d10b5e7