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

Change-Id: I12c7b2f22240bde2c0730df959d090a53682a2e9