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

Change-Id: Ibeec24813af48a5142959fd77ec206486afed204