Merge "BGDexopt: Clean up ordering"
am: 33ac5052c9

Change-Id: Id09e7c5ec0c35daaa04f346e7966f28bcb3bc52a