Made build-app tenant aware

Change-Id: I4f67d834931490c95a019c5d399efc3ab913d9dc
Merge "Made build-app tenant aware"