Merge "Merge "Fix build break due to 32/64 bit compilation." into nyc-dev am:...
Merge "Merge "Fix build break due to 32/64 bit compilation." into nyc-dev am: 5fb90f91 am: 5f116e70" into nyc-mr1-dev-plus-aosp
am: cdd7f61c
* commit 'cdd7f61c':
Change-Id: I43857a19541c78af5c5f90d0e4acf4c0331c6181