Merge "target: msm8909: Control compilation of code based on some flags"