Move installd back to Android.mk.
am: 00b6f68c5c

Change-Id: Iad4819473f6b25f6ac7aa31e23661b564cd49f0e