Remove empty files to eliminate validation issues at build time

Closes-Bug: #1265799

Change-Id: I8227c95dc5d4678fd83ef8df422b749a6708bb6c
author: diane fleming
Merge "Remove empty files to eliminate validation issues at build time"