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

Change-Id: I6d71f82f41f4341f9866591f978de333bf8092a5