Merge "PackageDexOptimizer: fix typo in log message." am: 228123dd53 am: 9323d8e163 am: 562e57185b
am: bef6872c45  -s ours

Change-Id: Ie327c63aaec2de544276b91e93633c208fd2f6cd