Merge "Use "long" instead of the more verbose but equivalent "long int"." into dalvik-dev