Merge "Remove bionic-specific ni_* workaround now bionic is cleaned up."