Add header guard to mapping.h am: 1a0eee28cc
am: 0ded9d7c67

Change-Id: Ib3b896a302845a32599182e49cd3113898a8f23d