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

Change-Id: Icc495090da84050f783bf8f25b88f09209e9750a