Merge 93e2f91a3c61a9ccb06c80d17a607fb1588dba30 on remote branch

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