Merge "Move registration of AssetManager.mObject to zygote." into pi-dev am: 85ec63532f
am: 5652b43cca

Change-Id: I55960d3184c1959b1ac7a09930050d8d9acae1c0