Merge \\\\"DO NOT MERGE: Libskia test failing on 64bit devices.\\\\" into mnc-dev am: 4a8fa37eeb am: 005eeb6a19 am: 41b15d85b3
am: 91b15c8f4e  -s ours

Change-Id: I841b339d0976edb760c8787a29097d8053ec728d