Merge "libbinder_ndk: ScopedA -> ScopedAResource" am: 186578aa8b
am: 3dbe317d67

Change-Id: I183c5854d542750f0480b05d26181581cf9ed213