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

Change-Id: I6a989741798a302a78ded6c9dcd4cd9700d9107c