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

Change-Id: I207d3463f90e5ff5a78c976f98e301d0dd852ed0