This reverts commit 8d01fd11c7 [formerly f1772fc7e2] [formerly 3c532660b0 [formerly 5c2d02a67bd5b4594c6d90afcbae4e8159e0edd1]].
There were nativeLib files inadvertently committed to this DR.
They will be reverted and only the correct file will be committed.
Change-Id: I72750a5cc4a47603396cf89cd822d7cb0c53f55b
Former-commit-id: 714044cb9b [formerly aed96fb67913e5a300f5b201838ac3dd96d5f72b]
Former-commit-id: 0dbe5119a5