Merge "Add hwservice_contexts to default builds." into oc-dev am: 14d363fa42
am: d997015f4b

Change-Id: I9512aead06e3df88a70c10d54d2d0dd31806e69e