Merge "Merge "Use fds for dexoptanalyzer from installd" am: 729c847625 am: 03e1ed0101 am: ceeb154b9f"