This reverts commit 4a047317. Reason for revert: NDK build broken Change-Id: Id98bf9d5f82ed72d8c489264cf9d754e8ea1d27e