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

Change-Id: Ic0b3323ee46e0bacffd62bd763da15e3256da783