Merge "Remove -nodpi assets for now to fix zygote preloading Bug: 5255505"