Merge "AAPT: Don't try to rewrite String constants when loading shared lib"