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

Change-Id: I94246360002ea8aebd3eda80272b6f697d0eeffc