Merge "libbinder_ndk: ScopedA -> ScopedAResource"