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

Change-Id: Ic784a133d04aed855a0150eb7597375cc053c0e0