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

Change-Id: Ifab7ffbb802f1f7f71cc222ae842c7c1ebc25da6