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

Change-Id: Ifde23efee7be33a72de8d92aa331301d2d4598e2