Merge "Use zipalign -p to page align .so files"