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

Change-Id: Ide925ed4c52981361680c31ed1e1e8d1a9268dd7