Merge compute WADL back into one file

bug: #1211367

Change-Id: I29e4fa78f57961e6c2bb0ee9360c193af432fef7
author: diane fleming