Merge "Allow abi diffs sanitized variants of vndk libraries on production...
Merge "Allow abi diffs sanitized variants of vndk libraries on production devices." am: ce617bbb am: 516bc127
am: 2a9b72b4
Change-Id: I7279f487cb9cf3e634f0e93dce5e56be4b1f5d6f