Merge "Pass targetSdkVersion to installd" am: 106a915256 am: 77ba6baab5
am: 4bf5b7c59e

Change-Id: I919eb49c4610477565cd85912e88ec135317a0b3