Merge "Clear separation of RootList Context Menu items and DirList items." into arc-apps
am: 534e78c2f0

Change-Id: Ide1b65a731da03a92cd5fa2e63f720f70c593c46