Merge "Fix library loading order in .mk files."