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

Change-Id: I904d482c71aa8e1b8859d2d27643592cff49ffb9