Merge "Enable the can_maintain_original_method_order capability"
am: 56c7e1ea3d

Change-Id: Ibcd66760fe38ecaec3109a1f1fae075e62d19d45