Merge "Default to /dev/binder if binder node doesn't exist." am: 1a49778ecc
am: d2dc3fc9d3

Change-Id: Iea6df244c852ce5be4d459f37429ac164334ba62