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

Change-Id: Ia6024f6cdc91813a646442c8770c3cc8deab53d4