Merge "DO NOT MERGE: Libskia test failing on 64bit devices." into mnc-dev