Merge "Fix testSynthesizeToFile cts test" into pi-dev
am: e1f4521e9b

Change-Id: I49bd5c89aea3c8107ce5f9eed0346dff9c3bb2ae