Merge "Add dexgen project dir"