Merge "adb: static constexpr." am: 28c9539697 am: cf6b842839
am: 4bff0d5c50

Change-Id: Ib2d9b98e31fca1348e8b2837876afe336c6e3c0e