[automerger skipped] Move tests to .test package am: f24590f6c9 am: 6afec2ab78
am: 4fbf3ab1ac -s ours
am skip reason: change_id Ib10d694737ffa40c1eee063f8ac789a01dbdc7dd with SHA1 997ab0a71e is in history

Change-Id: I1c9d1900a660dc9c80cfa14d99cd30273def4200