Merge stage-aosp-master into pi-dev-plus-aosp
am: 3102656765

Change-Id: I2143eb78968897552601d0c7502364a9c0448b20
tree: c5dbe7518f9c8b0e72293c592dfc29cddea2ee51
  1. Android.bp
  2. test/
  3. time_in_state.c