Merge "remove linking against aidl enum"
am: 4a084f536f

Change-Id: Ie412155572101bde7d783e9f73fd1b40a9daa0d9