Merge "Remove dump-oat-Calculator"
am: bfcd0d3da6

Change-Id: Idb0dd1aca2fe18abfed1f0eac8d45f2f34f03935