Merge "Merge "Avoid APF JNEBS instruction with R1 as it doesn\'t work" into nyc-dev am: 520ae86 am: 73ff13e" into nyc-mr1-dev-plus-aosp