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

Change-Id: If8627dcf7b664a4b6de5540c63d44ab55547e7ca