Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c
am: 269bdbcab1

* commit '269bdbcab18aa8c24a637937d885c045f408a12e':
  e4crypt_is_native has been moved into system/extras.

Change-Id: I7f08893a1e21891d35578180cbb66a4db2d91c15