Recombine hidl lib build.

Now that the libraries are combined, also combine their build so that it
is clearer what is going on.

Bug: N/A
Test: N/A
Change-Id: I0db446a99f4ff321107b78c16733b3a4abbe62a1
6 files changed