Merge "Fix double-freeing of ScopedAResource"
am: 3367b1e708

Change-Id: I028ab29eb2183b0f8b59b7a608399945a64fd639