Merge "Switch gcnodir name from basename to just removing .so" am: c1d7537d99
am: b2cff60b8a

Change-Id: I0ebd3ab2437688acfc773c31d2cc79cafdef11b9