Merge "Count native allocation for VD against Java heap" into nyc-dev