Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aosp
am: 567a7326c2

Change-Id: Ie3987944e259dea1d9a154fe7412fc81d382d158