Merge "Split target/product/sdk.mk into sdk+dev.git"