Merge "glacier: update fingerprint, build FM app, use correct .mk" into froyo