Merge "Revert "Move installd back to Android.mk.""