Merge "Remove the unnecessary aidl.include_dirs property"