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

Change-Id: Ifcad9b4aec91f4f5a106a482412af4c070fb1254