Merge "fstab: add noemulatedsd to sdcard1" into cm-12.0