Merge "Revert "Move installd back to Android.mk.""
am: 1ae0486a54

Change-Id: I3a57d5d8a62aa17b834091b142fd07c0d436708c