Was missing updates to globals and weak globals. Bug: 21288130 Bug: 21440428 (cherry picked from commit 1a302fb4) Change-Id: I41b64e8aae906f5986de483db096d8191e45f260