Merge changes I2198f8b5,I245c859e

* changes:
  time test reclassification as gTest
  system/extras: Replace cutils/log.h with android/log.h or log/log.h