Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev