Merge "Move the app to /system_ext"