Merge "Un-revert "Audit execution of app_data_file native code."" am: 34bd20fbdd
am: 99a069c082

Change-Id: Ia13f873dfd2d46f28a4d2b7abc6f1df19184cd9c