am 706625d6: Merge "Revert "Bionic is getting rid of sys/timeb.h""

* commit '706625d653c90b26036767b549e04aedfc54b08c':
  Revert "Bionic is getting rid of sys/timeb.h"