Merge "Remove time_in_state.o from build"
am: 1dc90cbfd3

Change-Id: Iedff4ef208c386e6cf85e5f0e1986e8771cf18a7