Move registration into android package
am: 96548c9ee0

Change-Id: Ief5f68fdd913be2c5209a1da9a60ecb195198a44