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

Change-Id: I151f1fe596956f3c7348f48375331b658324af7d