Move installd back to Android.mk. am: 00b6f68c5c am: db792601f6 am: 577e692768
am: 965a5cc82d

Change-Id: If3924379547b8f75f13d8aea9ffba1ab1ddcbbd7