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

Change-Id: I13edcad8945fb1e49a563e7ba964749e489bc813