am 2550355c: resolved conflicts for merge of d410a9b3 to mnc-dev-plus-aosp

* commit '2550355ceb2bd5e2815f333067e0ccff11fbf275':
  Fix insmod module size
  Enable property expansion for insmod