Rebased on re-compiled on the latest version of the nativeLib code. Former-commit-id: b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f