Merge "Prepare to move dexopt calls to Binder." am: d7b144a5e9
am: 35cbe8ffb0

Change-Id: Ice3c37568ae7185dfe028d3019abf5204aa93963