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

Change-Id: I9050a768352cd99307ffa9fd3a437b9139f97014