Merge "Uninitialize constants during libjavacore unloading." am: 1362cac3fa
am: df8253f285

Change-Id: I99b347ea015eaecc124e0d0064bc43b060cf83d1