Merge changes from topics "gpuMem", "timeInState"

* changes:
  Rename time_in_state.o to timeInState.o
  Rename gpu_mem.o to gpuMem.o