Merge bdf84e71f9429936c6148b1dced69cbbd8c004fc on remote branch

Change-Id: I82f6b51c49cbfe5fc9cd85f23c8958bfac5b48d9
tree: 2da7610edef803d71f05bc3d0301516885a40120
  1. test/
  2. Android.bp
  3. time_in_state.c