am fe5d7c78: am a2bfde63: am fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set porperty"

* commit 'fe5d7c788bc823f422f89c518949de5cbd77e996':
  dalvik heapsize: Remove obsolete flag, set porperty