Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am: 851afe56b8 am: 0e01cae667 am: 74acde1bc5
am: c28592da33  -s ours

Change-Id: If1bbd5d4040381b9bcd6e08598a7e35e01143015