[automerger skipped] Increase the master key size to 256 bits
am: b7ff91bc00 -s ours
am skip reason: change_id If00331c303e6cc7bc95a2ab624d0e19bec4e587e with SHA1 d0315735fd is in history

Change-Id: Icc38d3bc9c96e984f04be080f2383c31b04bcef7