Merge "Remove a directory that seems never to have been used." am: b887a28c5b
am: 4b67fdcc05

Change-Id: Ic10dce61ae33b6c7038549c3ae289c842a45ef73