Merge "Bionic is getting rid of sys/timeb.h"