Merge commit '64c277c24bf52762e36185cc769d1b29233e20d4' * commit '64c277c24bf52762e36185cc769d1b29233e20d4': BUG 1993354 : Add zipalign to SDK
Merge commit '64c277c24bf52762e36185cc769d1b29233e20d4' * commit '64c277c24bf52762e36185cc769d1b29233e20d4': BUG 1993354 : Add zipalign to SDK