Fix some merge errors

Change-Id: Ic0dd1564042c84955292ae0c3ed53aadc8ea4896
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
mach: msm: fix mismatch.

Change-Id: I1f943875f86de5022df31e467c1b4daba48bb27a
Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
Add build script

Signed-off-by: Josue Rivera <prbassplayer@gmail.com>

Update script

Change-Id: I735674cda2dadb0f222739c9f26b700f700d88d1
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>