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

Change-Id: I43e8540a0564c147621cd696361e1decaf33b76b