Merge "Fix library loading order in .mk files."
am: b796529a56

Change-Id: I19dcd234f143c9aae758ea66d9273d015d04e7b7