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