Merge "Enable compiled-methods= dex2oat switch"
am: 8be74495ac

Change-Id: I64c6fb97997642108337463054428c48ff9a4d28