Merge "Allow authfs to read extra APK mount"