Merge "Use AID_SYSTEM as uid when creating oat dir"