Merge "Uncompress .dex/.so files in Dialer" am: f48d6d55db
am: 93bca4083e

Change-Id: I94bab59a3203e364d22f87f6aee476f56406b101