Remove annotations with constexpr params
am: 3dfccafba4

Change-Id: Ice6677138250a3c67ed07022d36649ea529ab0f4