Merge "sourcedr: Extract codesearch code" am: 4b1d2a6512 am: bc69996f1a
am: 28f8fa0b21

Change-Id: I75f065294d984da1553dcaaaf6c9369955799547