Merge "Revert "Remove ftime from bionic LP64""