Merge "Disable compact dex for input fd == output fd" am: 69acdd7512
am: 90c7467239

Change-Id: I6d9d8dcf172e5e9521e097f392a00236b4831c60