Merge "Use stdint.h instead"
am: a4342e7599

Change-Id: Ie8206039f3a3fded0b0b810340ddc0d46754bf4d