Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb