Merge "libmodprobe: parse kernel command line for module options" am: d1e9812217 am: 6d46873127 am: 0019007173

Change-Id: I728a441962ea5f358c48a2b6fa43ce131c1f0eba