Merge "Remove manual interface that have been AIDLized"