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

Change-Id: I5f8035cb13d51a038b81ddc779e2881f683eb200