Merge "Removes use of NodeAPI and BIND_LISTENER. am: 603b4572 am: 2759ff63 am: 464bdb00 am: 9945cdf7 am: f60722b1 am: 504783d0" into nyc-mr1-dev-plus-aosp