Change-Id: Ibe977a92acb93a78e323a40f53d653059b07bc0f
Only meas_json is added so far, since the other related ones are conditionally built. Change-Id: I35ba3c19fcdfb5663691a67c9876537765963c5d