Merge changes from topic 'simplify_app_process_asan_modules' am: 9a3bd76ab4
am: d3708a5aeb

Change-Id: Ieda8df429285548676089a7653e97ea36b542526