[automerger skipped] Merge "[binder] Replace NULL/0 with nullptr" am: a800be8391
am: aabd6b7fa3  -s ours

Change-Id: I61abfa19c1958be30c36b0217f5cc836a9e75646