Merge "Merge "Add dalvik.vm.force-java-zygote-fork-loop" am: a8540eeb am: 12f58973 am: 13945aad" into sc-v2-dev-plus-aosp