Merge "Remove sys.vdso property" am: bb11b35c03

Change-Id: I91cfdbbcbd02a2b6c3ff0278d129a6daf2a43807