am cda3d433: am eacc8a05: am 529943c7: Merge "Disable packed relocations for NDK builds"

* commit 'cda3d43345a43059065b538b63228007a2da62fc':
  Disable packed relocations for NDK builds