Merge "Revert "Revert "Remove ftime from bionic LP64"""