Merge "Do not run 999-redefine-hiddenapi under jvm/redefine-stress" am: 8d2befc479
am: 05f7ed62ce

Change-Id: If816f6558c4079eb8524cb18391228925c1aea0e