Merge "Use stdint.h instead" am: a4342e7599
am: 49ccf3ad1b

Change-Id: If4ccde236519722d0a7da8a04bc81a17496d1e53