am 77b01a8c: am 6f2f23a4: Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb

* commit '77b01a8c2230a7467979d8ab56c0a65c1d6b0640':
  Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer