Merge "libbinder: empty ping transaction" am: 67591ab43b
am: 6526cb999c

Change-Id: I961e5a88ef197a20fad5b933021dfb955053a079