Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev