Merge "Don't include patch information for dex preopt." am: 6f8e0d06e4
am: bf0fea29e6

Change-Id: I1f9c79b869f4a270e7ce3524f4bbb115fdef2f90