Break up hwservicemanager build.
am: 8e0cc27f39

Change-Id: Icd0aace41670611630db63c79705971acf12ec05