Merge "2 more missing Result::ok() calls in system/linkerconfig" am: ffacdd9477 am: 284084a3d1

Change-Id: I9eacc7a5aa22b823d0d4bca8666d6f9eaf01282c