Merge "Make inlines static"
am: e338b979f9  -s ours

Change-Id: I2a94c355f424a516069077cb3aa8d4dd1d5cd716