Merge "Fix path escaping for aidl generated java"