[automerger skipped] Merge "remove linking against aidl enum" am: 4a084f536f am: b52b64c880
am: 6b9e098335  -s ours

Change-Id: I005edcc443036b7fa336a655ce294c0aa6cb7c6c