Merge 1c6ac41c2f29a03d292348c74ee7fa149067ec4e on remote branch

Change-Id: I4bd6b790ae21fc72bcec0c9f9dd76f17d4150564
tree: dede9e243db6efe92978faf8fd6e953e0298fbe6
  1. test/
  2. Android.bp
  3. time_in_state.c