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

Change-Id: I2eaba6d08014c4834222890839a4876597e611aa