Merge "Teach ApfGenerator about the new opcodes for accessing data memory" am: 5a533ae460 am: faf23c9281
am: 97bdfc8111

Change-Id: I6332749eb21531d54a0a51c8e2849ff1572adfa2