project updated to be compiled as AOSP app; added FI-mode only system property evaluation

Change-Id: I4e6a7da6b56a40c9b096a2620f292b878d94b636