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: 08e8ba3e
* commit '08e8ba3e':
Change-Id: Iffd7ff92bb9f4a06cd419b53e981ed0d1ad3ce64