Merge "Make signapk align .so entries to 4096 bytes." am: dbb5527a9e am: 7f1eda800d
am: 3ad587e9ff

* commit '3ad587e9ff6b90b80b30b82d0bc51cc40b95c85a':
  Make signapk align .so entries to 4096 bytes.