Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev
am: 2baa393238

Change-Id: I5c35bae390870d6582d863e16013afb897117d0b