Merge "Move test libraries under /data/nativetests" am: 0f81dd3548
am: b2d09c71b1

Change-Id: Idb0701d47fabddaf4f94fe00235ed5a0baca1588