Merge "Add Terminal app to build."