Merge "bionic: add vdso time()"