Merge "Change tmp dir to /data/system/users/0/fpdata/."
am: 3f4e982fbc

Change-Id: I7ab1bb0acc25188d8e6ae8b67773d0bcb8eeb1f1