Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev
am: 212a6f264f

Change-Id: I2f092b325c8b5333dc8435cf7b41a652d6c8b2be