Merge 22f85375c479b8f0dc6d2499c731b494bed61e6c on remote branch

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