Merge "In place split install native support" into pi-dev am: f4e0438a46
am: 3bc573f375

Change-Id: I18405fea7c2c0813ab352c6c7a686ebb28c9db13