Merge "Remove unused native implementation of Object.wait()" am: 3f89c2ddca
am: 314f0b380f

Change-Id: I337680369560598b54c6d1e9cb42d2ac112fa435