jf: fix fstab headache

Change-Id: I52eba63044b3b7e7727d295fcd8fb280cc2a14cb
jf: Remove proprietary audio encoders for now

Change-Id: I94b3a39676e81d60a5768d3335c1d3cacfa56af9
Merge remote-tracking branch 'cm/cm-10.2' into HEAD