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

Change-Id: Iea2e8e35fa4e7144b67b1ef7a1d65e9a9147fad6