Merge "Use Android Q compatible external dir"