Merge "libbinder_ndk: AIBinder_Weak_delete sets nullptr" am: e9f06443be
am: 4848e11761

Change-Id: Id61d59bd49b33a69a4b6db0478e0c888ec879d62