Merge "Use DEX2OATBOOTCLASSPATH in installd."
am: 95ea7b751a

Change-Id: Iddddc8bbef7feb2188b991d46ef4c3d28d50011c