Merge "Merge "Enforce system/root/shell for dexopt operation." am: c900ba3cd6" into stage-aosp-master